popupMenu: Fix another child popup regression

When switching menus, we need to make sure we close all existing
grabs, not just the first one.

https://bugzilla.gnome.org/show_bug.cgi?id=695859

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 3d2b4e60c1ff25fc5264300760b908b56255b0c1..b751daf9e03a18f080f50970c50666d4947553e5 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -2110,9 +2110,9 @@ const PopupMenuManager = new Lang.Class({
     },
 
     get activeMenu() {
-        let actor = this._grabHelper.currentGrab.actor;
-        if (actor)
-            return actor._delegate;
+        let firstGrab = this._grabHelper.grabStack[0];
+        if (firstGrab)
+            return firstGrab.actor._delegate;
         else
             return null;
     },